From 4b4f92e98d6bdab2a9b7fdd9474bff988bdee0cb Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 10 Sep 2008 10:51:48 +0100 Subject: [PATCH] x86, xend: Fix processing of cpuid config parameters There is an python indentation issue keeping the full range of syntax for the cpuid config file parameter from working correctly. This patch fixes that. It also fixes some misspelling and a missing 'x' in two of the example config files (must have 32 bits represented for cpuid registers). Signed-off-by: Bruce Rogers --- tools/examples/xmexample.hvm | 2 +- tools/examples/xmexample.hvm-stubdom | 2 +- tools/python/xen/xm/create.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm index 63df017974..3df007fd81 100644 --- a/tools/examples/xmexample.hvm +++ b/tools/examples/xmexample.hvm @@ -220,7 +220,7 @@ serial='pty' # Configure guest CPUID responses: # #cpuid=[ '1:ecx=xxxxxxxxxxx00xxxxxxxxxxxxxxxxxxx, -# eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ] +# eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ] # - Unset the SSE4 features (CPUID.1[ECX][20-19]) # - Default behaviour for all other bits in ECX And EAX registers. # diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom index 94d6c1b103..bfceef30f3 100644 --- a/tools/examples/xmexample.hvm-stubdom +++ b/tools/examples/xmexample.hvm-stubdom @@ -236,7 +236,7 @@ stdvga=0 # Configure guest CPUID responses: # #cpuid=[ '1:ecx=xxxxxxxxxxx00xxxxxxxxxxxxxxxxxxx, -# eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ] +# eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ] # - Unset the SSE4 features (CPUID.1[ECX][20-19]) # - Default behaviour for all other bits in ECX And EAX registers. # diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index a4bf35071e..f5637dd60e 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -566,11 +566,11 @@ gopts.var('hap', val='HAP', use="""Hap status (0=hap is disabled; 1=hap is enabled.""") -gopts.var('cpuid', val="IN[,SIN]:eax=EAX,ebx=EBX,exc=ECX,edx=EDX", +gopts.var('cpuid', val="IN[,SIN]:eax=EAX,ebx=EBX,ecx=ECX,edx=EDX", fn=append_value, default=[], use="""Cpuid description.""") -gopts.var('cpuid_check', val="IN[,SIN]:eax=EAX,ebx=EBX,exc=ECX,edx=EDX", +gopts.var('cpuid_check', val="IN[,SIN]:eax=EAX,ebx=EBX,ecx=ECX,edx=EDX", fn=append_value, default=[], use="""Cpuid check description.""") @@ -971,7 +971,7 @@ def preprocess_cpuid(vals, attr_name): "of the register %s for input %s\n" % (res['reg'], input) ) cpuid[input][res['reg']] = res['val'] # new register - setattr(vals, attr_name, cpuid) + setattr(vals, attr_name, cpuid) def preprocess_pci(vals): if not vals.pci: return -- 2.30.2